From 250cccd2242744fc7b5f8075ff5064eff0328504 Mon Sep 17 00:00:00 2001
From: "djm@kirby.fc.hp.com" <djm@kirby.fc.hp.com>
Date: Thu, 22 Sep 2005 12:06:33 -0600
Subject: [PATCH] Minor drivers/xen changes and includes to support
 xenlinux/ia64

---
 linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c              | 4 ++++
 linux-2.6-xen-sparse/drivers/xen/console/console.c         | 3 +++
 linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c         | 2 ++
 linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c       | 1 +
 linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c     | 3 +++
 linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h | 2 ++
 6 files changed, 15 insertions(+)

diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c b/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c
index 3f32baa895..4377aa5889 100644
--- a/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <asm/pgtable.h>
+#include <asm-xen/xen-public/xen.h>
 #include <asm/fixmap.h>
 #include <asm/uaccess.h>
 #include <asm-xen/xen_proc.h>
@@ -435,6 +436,9 @@ gnttab_init(void)
 {
     int i;
 
+    if (xen_init() < 0)
+        return -ENODEV;
+
     BUG_ON(gnttab_resume());
 
     shared = (grant_entry_t *)fix_to_virt(FIX_GNTTAB_END);
diff --git a/linux-2.6-xen-sparse/drivers/xen/console/console.c b/linux-2.6-xen-sparse/drivers/xen/console/console.c
index c18a0c00b2..1206e4ea6a 100644
--- a/linux-2.6-xen-sparse/drivers/xen/console/console.c
+++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c
@@ -691,6 +691,9 @@ static int __init xencons_init(void)
 {
 	int rc;
 
+	if (xen_init() < 0)
+		return -ENODEV;
+
 	if (xc_mode == XC_OFF)
 		return 0;
 
diff --git a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
index d0b1e64175..f3103092f1 100644
--- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
+++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
@@ -25,6 +25,8 @@
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
 #include <asm/tlb.h>
+#include <asm-xen/xen-public/xen.h>
+#include <asm/hypervisor.h>
 #include <asm-xen/linux-public/privcmd.h>
 #include <asm/hypervisor.h>
 #include <asm-xen/xen-public/xen.h>
diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c
index 6ace0c42b7..45ccdfa3be 100644
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c
@@ -43,6 +43,7 @@
 #include <asm/hypervisor.h>
 #include <asm-xen/xenbus.h>
 #include <asm-xen/xen_proc.h>
+#include <asm/hypervisor.h>
 #include <asm-xen/linux-public/xenstored.h>
 
 struct xenbus_dev_data {
diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
index c671d92ba0..094d81870e 100644
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
@@ -674,6 +674,9 @@ int do_xenbus_probe(void *unused)
 
 static int __init xenbus_probe_init(void)
 {
+	if (xen_init() < 0)
+		return -ENODEV;
+
 	bus_register(&xenbus_frontend.bus);
 	bus_register(&xenbus_backend.bus);
 	device_register(&xenbus_frontend.dev);
diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h
index 9d766f8c39..55c8761913 100644
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h
@@ -140,6 +140,8 @@ void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order);
 #define MULTI_UVMDOMID_INDEX 4
 #endif
 
+#define xen_init()	(0)
+
 static inline void
 MULTI_update_va_mapping(
     multicall_entry_t *mcl, unsigned long va,
-- 
2.30.2